From e18c67eaf44193ffef416a192553220e7531e9e1 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 12 Oct 2007 15:37:13 +0100 Subject: [PATCH] x86: Fix acpi_parse_fadt() Prevent returning early, so that other information gathered in this function will not occasionally be missing for the consumer(s). Signed-off-by: Jan Beulich --- xen/arch/x86/acpi/boot.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 5973fd53eb..cbaa5ecbe7 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -491,11 +491,9 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) /* detect the location of the ACPI PM Timer */ if (fadt->revision >= FADT2_REVISION_ID) { /* FADT rev. 2 */ - if (fadt->xpm_tmr_blk.address_space_id != + if (fadt->xpm_tmr_blk.address_space_id == ACPI_ADR_SPACE_SYSTEM_IO) - return 0; - - pmtmr_ioport = fadt->xpm_tmr_blk.address; + pmtmr_ioport = fadt->xpm_tmr_blk.address; /* * "X" fields are optional extensions to the original V1.0 * fields, so we must selectively expand V1.0 fields if the -- 2.30.2